Find or create [Closes #14]
Merge pull request #27 from luisobo/14-find-or-create

Find or create [Closes #14]