almost done!!
resolve confilct
Merge pull request #2 from frankfzw/master

steal