Merge pull request #8 from topysl/fea1

fea1
fea2
Merge pull request #10 from topysl/fea2

Fea2