Closes #261