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

Performance improvements.