Merge pull request #365 from parrt/master

convert toMap usage to parser method calls