Alias support

Pull alias support from raphaelmonrouzeau