Merge pull request #14 from Grizzard/master

Merge branch 'Donnie-Changes-for-Speed'
Merge pull request #15 from Grizzard/Donnie-Changes-for-Speed

Merge pull request #14 from Grizzard/master