Issue 20

Fix issue #20