updates for travis integration
Merge branch 'dev'