Merge pull request #112 from HRogge/master