Merge pull request #196 from hunner/release_1.1.0