Merge pull request #13 from cnlpete/development

refactored to use UNIQUE_PREFIX for caching ids