fixes gh-354
updated tests
Merge pull request #355 from ju1ius/gh-354

fixes #354