Merge pull request #13 from johnwlockwood/development

Finalize 0.0.13
Merge branch 'master' into development