Closes #380