added final touches
Merge pull request #1 from joyceyan/master

added final touches