Fix parser
Updates
Merge branch 'master' of github.com:zhoukaiven/fb-summer-of-hack-2013