Added aliases, fixes #18