fixed Makefile deps, qualified name handling in algorithm
Merge branch 'fullname'
merging working branch back