#6 removed unused imports and added author