Create issue #19