More robust setup.
Bugfix + more doc.