Merge pull request #194 from isotes/master