Bugs fixed, not final probably
Merge origin/master