Major cleaning
Correct -i switch
Merge branch 'master' of github.com:kaernyk/spm

Quick merge
Merge pull request #2 from wizardskill/master

-i/r switch behavior corrected