Added validations
Merge branch 'master' of https://github.com/nalarfag/GWU_Builder