Resolve #14 - Command