Develop erik

With travis corrected.