Issue: #28

  * Added logic to update settings handler