Fix Errors
Merge pull request #1 from antoniomeh/fix_serveral_problems

Fix Errors