Closes #243