new ch2 update
XMerge branch 'master' of https://github.com/darkdigitaldream/Typhoon