Reverted $alias parameter requirement, fixed annotations
Merge pull request #37 from evertharmeling/master

Reverted $alias parameter requirement, fixed annotations