Initial Import
Merge pull request #6 from Bergsocke/developer

Initial Import