Merge branch 'step5'
Merge pull request #3 from scahyono/step5

Merge branch 'step5'