added proper xpath support - #33