Debian rebase

rebased debian on master