Misc cleanup
Clarified docstring
Correct merge conflicts
Merge pull request #40 from Mause/misc-cleanup

Misc cleanup