Catching up

Cloning, changing adding some more fails and uploading back at the
server
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md