Merge pull request #35 from jryberg/master

Updated documentation