Changed GetPropertyName to support inherited properties. Fixes #6