Merge pull request #3 from jtenner/master

Update Development
Merge pull request #4 from jtenner/development

Merge pull request #3 from jtenner/master