fixes return type
simplified syntax a bit
Merge branch 'api-experiments' into develop