Updated several modules
Merging