making previous change more scalable
Merge pull request #9 from surreal8/master

making previous change more scalable