Merge pull request #217 from HRogge/master