Issue19

Fix issue #19