Various syntactical errors
Merge pull request #1 from evanp/master

Various syntactical errors