Merge pull request #346 from ddobrev/master

Fixed the finding of classes to also check name-spaces
Fixed an ambiguity between an internal ctor and a potential wrapped one.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>