Merge pull request #3 from chrift/master

Merge pull request #2 from chrift/1.x