Conflict 22
Fix conflict
Merge pull request #4 from mike96/master

inca o data