Removed excessive operations out of iteration loop
Merge pull request #95 from xeregin/test_optimization

Removed excessive operations out of iteration loop