Small changes
Merge branch 'master' into soda-submission