improve Efficiency
Merge pull request #591 from ndawe/master

improve Efficiency