Initial Import
Merge pull request #4 from Bergsocke/developer

Initial Import