Merge pull request #135 from mariusz-ostoja-swierczynski/fix/134-bug-…

Merge pull request #135 from mariusz-ostoja-swierczynski/fix/134-bug-… #459