version 0.3.11 - refactoring, all tests are OK now