content-type bugfix
fix for None callback
merge commit