MS - Validations and change text.
Merge pull request #16 from mss1982/master

MS - Validations and change text.