Merge steffen/thx member into binary_file branch