Merge branch 'dev' of github.com:twilson271828/ISIS3 into dev