Merge pull request #20 from ksmithut/develop

Develop