Fix Some Errors Related to PR #321
Merge pull request #325 from josehsantos/master

Fix Some Errors Related to PR #321