Merge branch 'hotfix/0.3.2'

* hotfix/0.3.2:
  @fix add validade columns
@fix
Merge branch 'hotfix/0.3.3' into develop

* hotfix/0.3.3:
  @fix