performance fixing
Merge pull request #2 from saqsun/dev

performance fixing