sync to version 0.5