Code improved
Merge origin/master