prepared branch for the travis testing