Removed useless semicolons and bug fixe
Merge pull request #329 from dad72/master

Removed useless semicolons and bug fixe