added scheduler
Merge branch 'angel'