Merge pull request #29 from xavierjurado/master

Implement findOrCreate:inContext: