old fixes (remade)
Merge pull request #18 from gastonci/gastonci_work

old fixes (remade)