[gh-4] Closes #3