Merge pull request #7 from cha0s/master

Added wrapper-as-function
Support for indentation of wrapped code