added validation
Merge branch 'master' of github.com:TriFaceDude/TDDD24