Merge pull request #3 from 1egoman/feature/authentication

Merge pull request #3 from 1egoman/feature/authentication