Merge pull request #4 from chrift/1.x

Merge pull request #3 from chrift/master
Merge pull request #5 from chrift/1.x

1.x