Pr/380

See #380