First commit, a lot of cleanup do be done
Merge Master