Adding validation
Merge branch 'master' of github.com:KrakenCRM/kraken