Merge pull request #70 from bromix/alpha28

Alpha28
Merge remote-tracking branch 'origin/master' into alternative_login