Fixes for future php versions
Merge branch 'master' of https://github.com/einicher/plexus
resolved conflicts