Bug fix with the api.
Merge branch 'release/0.7.3'