merge from development. V.0.1.0 fix.

Signed-off-by: Bravocado <bravocado.project@gmail.com>