Merge branch 'master' into xml-storage
Merge pull request #484 from bherila/xml-storage

Xml storage