Merge pull request #226 from nhr/master

Minor fix to packager logic