Merge pull request #112 from diemuzi/patch-2