Merge pull request #60 from wilx/1.1.x

Merge.