Create issue #18