Another portion of fixes
Merge pull request #3 from Daniel-Cortez/master

Another portion of fixes