Merge pull request #28 from johnwlockwood/development

Finalize 0.2.5
Merge pull request #30 from johnwlockwood/development

Finalize 0.2.6
Merge branch 'development'
Improve docstring for formatting
Fix docstring formatting