closes #268