jerpelea Merge pull request #34 from Chippa-a/master …