Merge pull request #1 from wluu/master

Merge pull request #7 from iwhitfield/master
Resolved issue with comma
Merge pull request #8 from iwhitfield/master

Fixed dumb comma issue. JS is the devil.