API simplification
Merge pull request #56 from romainneutron/api-simplification

API simplification