Merge pull request #2 from cgosingtian/dev_1.0

Merge pull request #1 from cgosingtian/dev_1.0_chapter_2