frankiefab100 Merge pull request #2 from RishonAlton/bugfix