Merge pull request #36 from rmannibucau/rmannibucau/proposal-for-adapted-2

proposal for adapted API