Initial Commit
Merge branch 'master' of https://github.com/stuka120/E-Framework
Merged Daniel Lang (Oscar) Pull Request to Master
Merge branch 'master' of https://github.com/stuka120/E-Framework