Cosmetic and performance fixes
*
Whitespace and message added
Merge remote-tracking branch 'origin/master' into testing
Merge pull request #3 from Badspeed/testing