Add support for aliases, issue #51