add x0r class
Merge origin/master