Initial Import
Merge pull request #3 from Bergsocke/developer

Initial Import