Merge pull request #6 from myrle-krantz/develop

Fixing up authentication.  Not finished integration testing yet though.