Bug fixes and API changes.
Merge branch 'master' of github.com:supernovus/exemel