Major update of the code #3

Closed
Belphemur wants to merge 7 commits from master into master
7 Commits