Fixed installer
Merge branch 'cuttingedge'