fixed all issues
Merge branch 'master' of https://github.com/kapil07517/Redeemer