Merge pull request #11 from mmurdoch/next

Version 1.0.1
Merge branch 'master' into next