Feature/phpversion

Ready for Merge