Merge pull request #156 from spmp/feature/spmp-changes