Merge pull request #19 from Memphiz/auth2