Merge pull request #125 from HRogge/master