Fin

Final version without changing in a long time.
Wiki updated