Fix build
Remove copyright
Merge pull request #632 from pedro-r-marques/pmaster

Fix build