Updated docs and stuff
Merge pull request #3 from lipis/master

Updated docs and stuff