merge changes from Frank Trampe
Merge pull request #3 from gpazo/PackageMan

merge changes from Frank Trampe