Validation rules merging moved to setup()
Merge pull request #100 from augf87/develop

Validation rules merging moved to setup()