user edit done
style fixes
Merge remote-tracking branch 'origin/master'