Yes, it will be better in another PR, just add it here to make travis work (i will remove and squash all the commits when this PR is good)