Closes #330