Some changes
Merge branch 'project_1_stable'