Removed unused import
Merge branch 'origin/master'