Merge pull request #542 from rustyswayne/master

Merge 1.0.1