Also handles static members. Fixes issue #2