Closes #273