add to general settings control task scheduler
Merge branch 'issue-36' into develop