Fix for #410
Fix GPL Headers
Merge pull request #458 from hav3n/branch-delete-fix

New Fix for #410