Merge dev for initial packagist release