fixes
Merge pull request #50 from ricardoquesada/general_fixes

fixes