Merge version 0.5
merge