some changes
Merge pull request #1 from SharonZh/dev

some changes