fixed duplication error
merged upstream
fixed merge conflict
added some semicolons
Merge pull request #3 from kylethebaker/master

added the semicolons