Merge pull request #25 from grubernaut/syntax_fixes

Update and Fix all syntax errors.