Closes #287