Slightly improved performance; code cleanup
Merge branch 'SolStra'