Implemented, tested and documented #202