#439 : Expand doesn't take Aliases into account
Merge pull request #440 from Yopai/master

#439 : Expand doesn't take Aliases into account