Merge pull request #85 from pointhi/master

little enhancements and fixes