merge Current work for version  v0.02