Add documentation on inference
Merge branches