Merge pull request #59 from wilx/1.2.x

Merge.