ticket:13 added required functionality without tests.