Merge pull request #14 from Tirael/master

Fixed flow conversion units after refactoring to T4 templates.