Merge pull request #130 from HRogge/master