Merge pull request #2 from northstream91/master

GimmeGimme TEST
Garbage

Test Data
Removed tempFile again, let's go on for real now!
Merge remote-tracking branch 'upstream/master' into branch_1