Feature/improve initial phasepresence

see #352 (closed)

Changes are small, but not backwards-compatible! Should be noted (with solution to fix potential compiler errors) in changelog!