Merge pull request #133 from ddobrev/master

Fixed the wrapping of instance operators to account for fixed instances
Extended the searching for classes to check nested classes as well.

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