[master]

- Fixed some bugs

Signed-off-by: Orlando Chen <seagochen@gmail.com>