Merge pull request #36 from stuforbes/master

Bug fix
Merge remote branch 'origin/development' into HEAD