Fixed travis'
Change example project
Merge