Sync with SPMFW

(Closes #40)