finished
Merge pull request #17 from kelly-liu/master

finished issue #3