Merge pull request #574 from leider/master

fixing crash if language in markup unknown
fix for updated node-validator (2.1.0) one more