[Issue #363] changed the api
Merge pull request #538 from MGhanem/C4_m0hamed_S12_api

[Issue #363] changed the api