Allow both types of authentication
Merge pull request #34 from salbahra/patch-3

Allow both types of authentication