many updates
Prepare for travis