Merge pull request #570 from rustyswayne/1.1.0

Lots of repository work