Removal of some simple warnings
Merge branch 'master' of git@github.com:DawnScience/scisoft-core.git