Proper handling of invalid directives
Merge branch 'master' of https://github.com/alexbrombal/transcend