Settings improvements
Fixed version: 0.1.4