This commit closes #1