Merged patches from support/0.1.x

Signed-off-by: BrotherEdison <brotheredison@outlook.com>