V0.5.0

merge v 0.5.0