Merge pull request #295 from shenrie/master

Fix minor bug in extended resource framework
Fix for compound association edge case