Closes #289