Fixed the validation issues that I could
Merge pull request #9 from reechani/master

Fixed the validation issues that I could