Add required fields
Merge branch 'master' of https://github.com/AndyWarrior/Intramuros
Fix bugs
Merge branch 'master' of https://github.com/AndyWarrior/Intramuros