dev

Travis tests WIP