Major updates on fields
Merge branch 'master' of github.com:CaledoniaProject/GuanXi