Merge pull request #425 from avuton/master

v2 Add copyright headers
More reindentation