fix for cramped visualization
Merge branch 'master' into embedded