Merge pull request #7 from WesGBrooks/master

master merge
Merge pull request #8 from WesGBrooks/master

cleanup
Merge branch 'develop'

* develop:
Merge commit '2c5fdcfe9aa5e6e28974828d776b9b1f7a36179f'

* commit '2c5fdcfe9aa5e6e28974828d776b9b1f7a36179f':