Merge pull request #994 from Razican/doctypes

Doctypes