Revised the setup, improved documentation (fixes #2)