Graphics optimized to bring optimal size bundle
Implemented suggestion #16
merging master to v3.7 branch