Hey I know this weird but I dont think we should have @author tags in this code. Can you remove them. 
If we need to know who wrote what we can use git blame.