Merge pull request #547 from rustyswayne/1.1.0

Merged cancelled 1.0.2 version code into 1.1.0 branch.