Merge pull request #22 from cmaumet/spmUpdate

WIP: Update SPM model