Fix some issues
update ver.0.0.3