Merge pull request #1 from spezzino/sp

merge base