Merge pull request #4 from scottlindeman/develop

Develop
Hopefully didn't mess this up