Added validations.
Merge branch 'master' of github.com:invisime/consolidation