Merge pull request #103 from HRogge/master