Forced commit.
Implemented scaling and touch removing defaults.
Merge commit '24b8b81'