Fixed author and removed unwanted imports.
Merge origin/master