Merge pull request #2 from jeroen/master

Adds support for wrapper html.
Changes cyform
ljlk
Merge pull request #1 from Patroklo/master

Updates the fork.