fixing build
fixing travis
adapting travis build
updating travis
updated travis
Merge branch 'develop'