Added installer.
Merge branch 'master' into installer