version 0.5.0
begin version 0.6
Merge branch '0.5'