+ @shyba - Refactoring and creating tests for issue #16