Merge pull request #1 from szeke/development

Development
!!!5 has been deprecated. Use doctype now.
Merge pull request #2 from margipat/development

Development - !!!5 has been deprecated. Use doctype.