include encoding fix from samitbadle #371