Merge pull request #1 from Bergsocke/developer

Initial Import
Merge pull request #2 from Bergsocke/developer

Initial Import
Initial Import