Closes #263