Merge pull request #117 from n8o/master