Removed aliasses and functions
Inital version
initial version
Initial version
Initial
Merge pull request #1 from hvanderlaan/master

Correct dev