Closes #269