fixing some issues
Merge pull request #21 from diegosarmentero/develop

fixing some issues