Added proper alliasses for functions
Merge origin/master