MADE:
--> Many warning fixed

TODO:
--> Merge to master