Merge pull request #31 from wilx/1.2.x

Merge.
Merge pull request #38 from wilx/1.2.x

Merge.