Improved s:system performance
Merge pull request #146 from ichizok/improve-system

Improved s:system performance