improve alias system
Merge pull request #32 from ray176/aliasImprovements

Improve alias system