Merge pull request #62 from wilx/1.2.x

Merge.