this commit closes #1