Fixed the master branch, after lots of problems :-)