Gabriel439 Merge pull request #42 from k0ral/patch-1 …