Added user option and comments.
Merge branch 'master' into mac