Made language verification work

Refs #129 @ 30m
Merge remote-tracking branch 'origin/master'