Issue52
do not merge before issue44 because this issue is using the changes from issue44 related to the implementation of the new API.
do not merge before issue44 because this issue is using the changes from issue44 related to the implementation of the new API.