added alias for elmo
Merge branch 'master' into linux