Merge branch 'feature/XMLreader'