Prepare for travis
Merge branch 'test'