add timzxz's work
Merge pull request #1 from timzxz/master

add timzxz's work