Merge pull request #230 from HRogge/master