Merge branch 'master' into ariana_julian
it is a little bit prettier
Merge branch 'ariana_julian'