Package URL Updates

Based on @dawonn's pull request #125