add scheduler
rebuild users
Merge pull request #75 from jimmy-sv/develop

bug fix