Thought i would help you :)

fixed the issues shown on rejected pull request