merge new stuff from black09/master