Closes #4