solved #299: clean result merged from elcin