initial version of user script, generally complete
Merge remote-tracking branch 'upstream/master'