Fixed bug
Fixed useless casting
Removed unreachable statement
Removed unreachable statement
Fixed typos
Merge pull request #125 from pborreli/typos

Fixed typos and minor bugs