Update convention.php
Merge pull request #192 from rural21st/patch-4

Update convention.php
Merge remote-tracking branch 'upstream/master'