Update to 4.1.0 and add support for aliases

Close gh-7, gh-8