Merge pull request #18 from Windower/master

Sync
Re-enabling settings saving.
Error fixes.
Merge pull request #118 from nitrous24/master

Settings save on exit re-enabled.