Replace " by ', remove spare spaces, and fix indentation
Merge branch '521-adding_counters' into develop