fea 3 commit 1
Merge pull request #23 from topysl/fea_3

fea 3 commit 1