Feature for issue #20

implements issue #20