Merge branch 'dev' of github.com:sjotterman/cubesolver into dev