I've done two features

Please help to review my modification
@taka-wang