Fixed first time installation
Merge branch 'test' into dev