Another modification in ProblemSet
Merge branch 'jsan_master' into jstylo_master