Updated version. Closes #279. Closes #280.