can you fix this and rebase on current master? note this might cause conflicts with your change in the .travis.yml file, please use the one from master and not from your branch as I did some additional tweaks in master