Merge pull request #12 from Geodan/master

pull request 20140314
redirect to login
Merge pull request #92 from MartijnHeuff/master

redirect to login