added convention to get rid of import statements
Merge remote-tracking branch 'origin/master'