increased idle time
Merge origin/master