Merge pull request #44 from jpetso/master