UNIT TESTING - DONE
Merge pull request #5 from OlshevskyR/develop

UNIT TESTING - DONE