Elusb3

We can merge this into the master branch