Merge pull request #2 from landrews/master

Merge pull request #1 from landrews/master
Merge pull request #5 from landrews/development

Merge pull request #2 from landrews/master