finish
Merge pull request #6 from cathylill/master

finish