Merge pull request #108 from HRogge/master