Fixes #3152 - improve API for developers
Merge pull request #15 from ares/bug/3152

Fixes #3152 - improve API for developers