b
Merge remote-tracking branch 'origin/master'
bunch of small changes after 2-20 meeting