Merge pull request #60 from NicholasShatokhin/feature

Issue #23
Issue #62