Closes #395