merge in dominik's changes to master