fixing travis
fixed travis test
Merge branch 'develop'