Correct several errors

The first version have several errors that are corrected with this revision.
Merge pull request #1 from omarisai/patch-1

Correct several errors