Issue24

implements issue #24