Most recent version
Merge pull request #1 from JoshVorick/master

Update code to most recent version