scheduling future classes bug
Merge branch 'master' into pinauthintegration