Small changes, mainly for API
Adding a missing alias
Merge pull request #1 from superckl/master

Merge changes into multi-world branch