Fixed issue #426
Unit tests added