Bug: Fix for package naming
Merge remote-tracking branch 'upstream/master'
Merge pull request #260 from isuftin/master

small bug fix. working on getting this working on QA