Settings can now be updated.
Merged master