add support for finding imported modules
merge with master after fixing old commit message