Cleanup of the code, shebangs are dangerous.
Merge pull request #1 from hvdklauw/cleanup

Cleanup of the code, shebangs are dangerous.