i36: fixes #36, refactor test
Merge pull request #37 from golyshevd/i36

I36