Merge pull request #222 from HRogge/master