Fixes syntax errors
Merge pull request #30 from ooici/bug-fixes

Fixes syntax errors