Closes #7