change pw and sched interval
auto merge
merging from github
merge
merge with master
merge with master