Merge pull request #162 from HRogge/master