Merging changes to support debian packaging