Merge pull request #128 from eile/master

PersistentMap fixes and test improvements
Fix "multiple definition" error in downstream projects