Merge pull request #116 from Fabii547/patch-10