--code optimization of hr-303
--code optimization of all extension
--fixes
Merge pull request #610 from divya-jose/optimization

Optimization