synced
version 1.0 done
merged