Merge pull request #35 from mehere/dev

Pull Request from dev -> dev-wee on 15/2
Scheduling Algo Stable
Merge pull request #36 from mehere/dev-wee

Scheduling Algo stable