using add all instead manual collection
simplify ifs
Merge pull request #29 from otaviojava/simplify_if

simplify ifs
Merge pull request #28 from otaviojava/manual_collection

using add all instead manual collection