Merge pull request #141 from kazoompa/master

Enhancement