Closes #268