Sync with Fritz

Sorry for the monster pull request ... will use branches now.
please leave /usr/bin/env ... not everyone has use/sepp/bin/perl