merge changes from master
add -A