Merge pull request #136 from HRogge/master