Fix the problem with class level variables for collection of complex types
Merge pull request #36 from shantanud/2.2

Fix the problem with class level variables for collection of complex type
Merge remote-tracking branch 'upstream/2.2' into 2.2