several changes
Merge remote-tracking branch 'origin'
minor changes