interim commit
Pulled
Merge branch 'master' of github.com:sanbar/CoreLibrary