Made more changes
Changed scene
Merge pull request #14 from shiyingzheng/master

Almost there