Merge pull request #1 from Zarph/master

commit
commit
Auth works