MS - Repair several details.
Merge pull request #21 from mss1982/master

MS - Repair several details.