Try to show separation between XML/XPath boilerplate and Yr related logic.
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from frodelu/master

Small code clean-up