kikito Merge pull request #19 from ExtReMLapin/patch-2