Fixex all inconsistencies with the guide
Merge branch 'master' of https://github.com/dario2994/PhiSimulator