Merge pull request #97 from akkie/master

Implementation of a more generic authenticator