Merge branch 'soulmatt'
Merge branch 'soulmatt'
Bug fixed about KBO