Reduced cyclomatic complexity
Merge pull request #182 from freez10/master

Reduced cyclomatic complexity