ass10
edit
edit2
edit3
Merge pull request #13 from yl2612/master

done ass10