minor changes
Merge branch 'master' of github.com:LCPQ/quantum_package
Bug in setup_environment corrected