adding new conditions!
Merge pull request #46 from inaka/marcelog_adding_conditions

adding new conditions!