Merge pull request #56 from viteke/master

fixes and style improvements
fix minor annoyances
Merge https://github.com/arago/rike
Merge pull request #57 from p1tz/master

merged
Merge https://github.com/arago/rike