Add aliasing
Merge pull request #79 from creynders/aliasing

Add aliasing