Merge pull request #52 from ctorstens/development

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