Implemented #46

Implemented #46.