current user test and some small improvements, making stuff private and so on
solved conflicts
Merge pull request #50 from dvicini/master

current user test and some small improvements, making stuff private and so