Arthur Updates

again oddr specific
Merge branch 'master' of https://github.com/vuLgAr/merlin