update v 0.5
merging