Minor Performance tweaks
Merge pull request #17 from techaddict/master

Minor Performance tweaks