Merge pull request #41 from wilx/1.2.x

Merge.