Merge pull request #194 from mpeuster/master