Merge pull request #476 from apavlenko:eclipse_import_fix