Closes #274