added feature requested in #93