Merge pull request #16 from wilx/1.2.x

Merge.