Merge pull request #142 from hazendaz/master

Maintenance