add quick & dirty patch to remove debug code
merge latest commits from origin