Add parsing lag fix
Merge pull request #60 from faizkhan00/master_merge

Add parsing lag fix