Properly support origin as package name
Merge pull request #7 from xaque208/origin

Properly support origin as package name