Issue 18

Close issue #18