Change waiting time in waitResponse() method.
Merge branch 'master' into storm1