api changes
Merge remote-tracking branch 'origin/cainvommars-master'