URI improvements and bugfixes
PersistentMap improvements and bugfixes
Merge branch 'master' of https://github.com/eile/Lunchbox