Merge master with alfredo branch

Last version of files uploaded, ready for deployment.