changes from a directory
Merge pull request #9 from objectos/mmarques_04_changes

MMARQUES-04: changes from a directory