add alias
add maven update
Merge branch 'master' into mac