Merge pull request #22 from jonkemp/fix-formatting-issues

Cleaned up some of the formatting, spacing and missing semicolons.
Merge branch 'master' into fix-line-endings