Merge pull request #91 from spmurrayzzz/master

Fixes #90 -- updates docstrings