Merge pull request #8 from BFALacerda/master

changed file structure
Changed parameters, most of them to default values