merge and added getCurrent user
Merge pull request #279 from dshurt/master

merge and added getCurrent user