Added test
Implemented feature