Closes #250