Merge pull request #173 from HRogge/master