Updated and merged everything

We can start cloning from this master...