Update modules

I am adding here all the changes from the markdown branch to the master branch, such that the master branch is now up to date.