Merge pull request #14 from topysl/fea_1

fea_1 commit 1
Merge branch 'acceptance' of github.com:topysl/git_test into acceptance