Closes #402