[gh-2] Closes #1