Edit issue #4
Create issue #7