Closes #401