Updated parsing code as per comments
Updated parsing code as per comments
Merge branch 'FinalChanges' of https://github.com/TaviscaSolutions/yellow-repo into FinalChanges
Merge pull request #53 from TaviscaSolutions/FinalChanges

Changes done as per comments