Closes #304