minor bug fix
Merge branch 'api_overhaul' into design_integration