sp2mki all changes
Merge pull request #1 from darekper/master

SP2MKI all changes