Merge pull request #1 from flydom/master

codekata_1
comment
Merge pull request #2 from flydom/master

second