Some fixes
Merge branch 'master' of https://github.com/cmester0/CmesterCore.git