Merges/commit fixes
Merge branch 'master' of https://github.com/joshuaegclark/SAMSS6.0.git