Merge pull request #1 from EricpolUkraine/master

merge with master
Merge pull request #2 from Bohdan-Tereta/master

merge with master
Merge pull request #84 from Bohdan-Tereta/fix

Fixed unit tests