Another Shell Upgrade
Merge https://github.com/LucasMW/Scheduler1019