Initial Import
Merge pull request #7 from Bergsocke/developer

Initial Import