Improved/Repaired Secheduling. Fixed #15