correct differents issues
Merge origin/master