Merge pull request #6 from davidrus/master

step-03