Remove empty lines.
Add auto discovering of headers and plugin creation in body.
Merge master