solves issue #79
Merge pull request #80 from kshileev/issue79

solves issue #79