-fixed the alias problem
Merge origin/master