partial #30
Merge branch 'master' of https://github.com/TBDFramework/StandardEngine