Edit issue #18

Close issue.