2500ms delay
Updated travis file
Merge branch 'master' into Dev