Some minor changes in parse function
Merging