some update
Merge pull request #3 from z17/dev

some update