Merge pull request #30 from piobyz/coredata

Issue 28.