merged from fork svenlehmann