Create issue #11
Create issue #12