Settings style
Merge remote-tracking branch 'upstream/dev-0.3' into dev-0.3
Merge pull request #166 from sammuel86/dev-0.3

Dev 0.3