implemented feature request #144