minor changes again
nm
Merge remote-tracking branch 'origin/master'
adjustment