final version before merge
pull request
Merge pull request #9 from dongnanzhy/master

final version before merging