Merge pull request #1 from Wisembly/master

Pull for update
Add spm support
Merge pull request #25 from spmjs/master

Add spm support