Merge pull request #16 from ctorstens/development

Development
Merge branch 'master' of https://github.com/ctorstens/ScreenOverflow into development