Fixed bug with recursion in package generation
Merge branch 'debian-package' into mine