change to match precise formulation of problem
add line
Merge branch 'dev'