Added the Ability to Use Different Types of Alias
Merge branch 'branched-aliases'