Merge pull request #30 from wilx/1.1.x

Merge.