Issue #7
Merge pull request #22 from NicholasShatokhin/feature

Issue #7