Performance improvements.
Merge pull request #14 from yippibrian/master

Performance improvements.