cleaned up
Merge pull request #22 from Hilaryous/parser

cleaned up