States set phase

Nicolas Tancogne-Dejeanrequested to merge
states_set_phase into develop

These are small changes to make the code nicer. A bug is also indicated, to be corrected later.

Merge request reports