Merge pull request #158 from HRogge/master