Merge branch 'master' of https://github.com/daniel-lang/E-Framework into daniel-lang-master
Merge branch 'master' of https://github.com/stuka120/E-Framework