Merge pull request #151 from HRogge/master