Update installation instructions
Fix merge conflict
Use get_called_class() instead of __CLASS__