dead code

'that' variable is dead code
Merge pull request #26 from bwiklund/patch-2

dead code
Merge branch 'master' into devel