1/3 fix, the rest later)))
Merge pull request #15 from devserg/patch-14

1/3 fix, the rest later)))