Merge delopment into master#23

JBlond merged 3 commits intomasterJBlond/php-diff:masterfrom

developmentJBlond/php-diff:developmentCopy head branch name to clipboard