Some validation and test code added
test Merge branch 'master' of github.com:GantMan/teamweb