Update
Merge pull request #5 from Bergsocke/developer

Update