Closes #262