Merge pull request #48 from wilx/1.1.x

Merge.