Merge pull request #1 from adamjcook/development

First merge into 'master' branch.
Merge branch 'master' into development