Added the organization signature.
Merge origin/master
Added user aliases.