Fixed #57

Also synced latest Andrei’s changes