Closes #280