new examples & fix
merge