increased the timeout(to be removed soon....)
Merge branch 'develop'