Issue #2416: Flag error
Issue #2416: Flag error
Merge pull request #45 from VisualSJ/Iss2416_RefactorRenderer

Issue #2416: Flag error