User settings

This is a pull request for issues #455 and #456.