Update for 1.1.0
Merge pull request #78 from xboston/patch-1

Update for 1.1.0