Merge pull request #12 from topysl/fea_1

fea_1 commit 1
Merge branch 'acceptance' of github.com:topysl/git_test into acceptance
fea_2 commit 1
Merge pull request #16 from topysl/fea_2

Fea 2