Eliminated "that" variable
Merge pull request #12 from lukehorvat/master

Eliminated "that" variable