fixes
Merge branch 'master' of github.com:samdmarshall/Core-Lib