Updated the installation process and fixed a few minor bugs
Merge branch 'release/v1.1'