Comfort chair improvements
Merge branch 'master' of https://github.com/pavelgorlov/dsfkjdfg