Merge pull request #230 from hubx/master