Merge branch 'sanritz'
add aliases
Merge branch 'master' into sanritz