Closes #405