Adjustments for SPM12.
Merge pull request #1 from gllmflndn/master

Adjustments for SPM12.