fea 2 commit 1
Merge pull request #21 from topysl/fea_2

fea 2 commit 1