Merge pull request #78 from rramsaro/schedule-feature

Fixed app crash
Merge remote-tracking branch 'upstream/master' into schedule-feature