Merge pull request #187 from HRogge/master