added some things)
try to merge
Merge pull request #2 from Shkorodenok/feature/bug2

Feature/bug2