Added new lib
Addex 'x' for views
Merge origin/master