Fixed issue #54
Merge pull request #60 from Orvid/issue54

[Parser] Fixed issue #54