Added basic validation
Merge branch 'master' of https://github.com/drunkrocketeer/Interface-Amersfoort