More installation tips
Merge branch '1.1'