Merge pull request #194 from dk/master