Closes #264