Merge pull request #178 from HRogge/master