Merge pull request #48 from xhunterx89/master

validate-2