Fixed installation.
Merge branch 'dev'