Fixes #5
Merge pull request #6 from theponti/refactor/authentication-#5

Fixes #5