docstrings
Merge pull request #7 from PatrickDropbox/master

docstrings