updated! With second section done!
Merge origin/master