Merge pull request #14 from johnwlockwood/development

Correct param docstring format
Merge branch 'master' into development