Merge branch 'master' of github.com:afc163/spm