Merge pull request #36 from Orvid/master

Large Performance Improvements
Merge pull request #39 from Orvid/master

Who doesn't like speed?