More modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	phar_article.md