Merge pull request #1 from symform/master

Changes to improve handling more load
Test