First version update
Merge pull request #1 from bachtk/02_Feature2

First version update