Merge pull request #5 from libeo/api-correction

Public API modifications