new fixes
Merge pull request #7 from nunovieira220/develop

new fixes