Merge pull request #34 from mtremer/better-authentication