New solution format

New format for the output of the generated solution.
Merge remote-tracking branch 'origin/master'