merged from jkrugs master