Rewrote validation.
Merge branch 'master' of github.com:ddsc/ddsc-core