UpdateCommand

Fixed #62 (partly)
Fixed #48