Closes #265