Merge pull request #246 from kbmorris/master

Correct misspellings in comments and output of msm
Fixed OS detection code.
Merge pull request #253 from Akythius/patch-1

Fixed OS detection code
Merge pull request #3 from marcuswhybrow/master

update from upstream