Added feature requested in #29