Corrected some errors
Merge pull request #2 from dfsatacs/master

Corrected some errors