Closes #240