Added feature requested in #179