User settings

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

(Not sure if this is applicable here, just wanted to point out one more option.)