Merge pull request #305 from HRogge/master