Some possible performance improvements
Merge pull request #1 from vctheguru/master

Some possible performance improvements