Merge pull request #2 from bradrhodes/BugFixes

Bug fixes
Merge pull request #4 from bradrhodes/master

Rollup of changes to v2.0
Renamed the files to have the version in the filename.