fixed validation issues
fixed some validation issues
Merge branch 'master' into team1_v1.1
Merge pull request #4 from BuracayBeach/team1_v1.1

Team1 v1.1