some changes?
A few more changes
Merge branch 'bobz' of https://github.com/bobz/yadr into bobz

* 'bobz' of https://github.com/bobz/yadr:
  a few fixes
merge fix