-- this changes are from dev branch
Merge pull request #1 from zhbc/dev

-- this changes are from dev branch