Improvements
Merge pull request #1 from lord2800/master

Improvements. Cuts execution time down significantly.