update code from xinyu
resolve conflict
resolve conflict
Merge branch 'master' of https://github.com/fredfeng/Scuba
instantiate