Update docs
Update docs
Merge pull request #40 from boiving/master

Update documentation