Merge pull request #1 from wizardskill/master

Merge changes in upstream
Merge branch 'master' of github.com:kaernyk/spm

Quick merge