continued: setup on Linux
Merge origin/master