merge #45 pull by ggrnd0