Merge pull request #7 from SlaunchaMan/master

Minor associated objects fix