Merge pull request #529 from rustyswayne/1.0.1

Housekeeping