Hybertb branch 2

Comment by Hubert B