Edit issue #15

Close issue.
Create issue #17