Merge pull request #1 from liqing9612/master

This is updated from my local computer
Manifest file
Merge pull request #2 from liqing9612/dev

Dev