Merge pull request #121 from mehere/dev-wee

Merge changes from dev-wee to dev.
sms
Merge dev_xue into dev
Merge pull request #122 from mehere/dev

Pull Request from dev -> dev-wee on 9/3