Merging SJF

Merging SJF to master