Merge lyoshenka's changes (Updated emogrifier to use PSR standards [lyoshenka])

Merged: Updated emogrifier to use PSR standards [lyoshenka]