Merge branch 'hotfix/Problem_1'
Merge branch 'master' of https://github.com/zeromancer1972/Foundation