Merge pull request #17 from pointhi/master

FIX #16