Resolving parse erors, and adding function definition
Merge branch 'dev' of https://github.com/AymanR/Ratra into dev
Update