Merge pull request #2 from c-mimms/master

Updating dev branch.
Merge pull request #4 from c-mimms/development

Merge pull request #2 from c-mimms/master