optimizations made
Merge branch 'master'