improved parser
Merge branch 'master' of https://github.com/Swofty/HackCMU-2014