Merge branch 'issue/219' into production
Merge branch 'feature/install' into production