Merge pull request #198 from HRogge/master