optimization optimized
Merge branch 'master' of https://rostar@github.com/simvisage/simvisage.git