fixing eclipse import errors
Merge pull request #564 from apavlenko:eclipse_import_fix