Add /sp/ support
Merge pull request #1273 from Proplex/new-branch3

Add /sp/ support