Sped up on various platfomrs
Merge pull request #3 from FroggyMe6581/petersCommits

Sped up on various platfomrs