Merge pull request #6 from magic8sky/master

finished chapter1