Taiwan edits
Merge branch 'master' of github.com:chrisleungcl/Project-A