XMLPath class added for future usage
Merge origin/master