b1 modified and committed

To merge with master