Added Parsing Fix.
Changed Location.
Merge pull request #2 from ParthKolekar/master

Added Parsing Fix.