Final Update
Merge pull request #80 from Bergsocke/developer

Final Update