Merge pull request #94 from simoendem/pSp

scholarship done.. not testing yet
scholarship done