Darn .. )
Merge pull request #363 from jrfnl/master

Darn .. )
Merge branch 'master' into Fix-settings-issues