Merge pull request #42 from maennel/pass_tests

Pass tests. Thanks Manuel Jecke.
Merge branch 'master' into bugfix_logout