Merge pull request #99 from khaledhosny/introspection-fixes2

More ntrospection fixes