The format that's super!

Fix bugs in parsing master


+137 -33
3 changed files