Missing `public` keyword
Merge branch 'upstream/master'
Update .gitignore
Update docblocks, remove close php tag, add getUserId() method
Remove php close tag
Merge pull request #2 from anhsaker/master

Update docblocks, remove close php tag, add getUserId() method