some updates
Merge branch 'master' of https://github.com/TTimTT/TPIII