Added alias management. See issue #13