bugfix, added more informative docstrings
Merge pull request #2 from mverzett/master

bugfix