ChadSki Merge pull request #8 from ChadSki/dev

Merge dev into master

Latest commit b885d9f

Mar 27, 2017