Merge pull request #194 from davidfischer/master