Simplify nested conditionals if possible
Merge pull request #424 from mattbasta/simplify_conditionals

Simplify nested conditionals if possible