Merge pull request #25 from wtangiit/master

misc enhancement during scalability test