accidentally committed these files
Merge pull request #20 from vhalbert/1.0.x_changes

accidentally committed these files