Partial fix for #304
Complete fix for #304
Added GPL headers
Merge pull request #305 from hav3n/branch-dialog-fragment

Partial fix for #304