Updated for packagist and composer