document installation better
merge master