Fixes JSLint warnings
Merge pull request #319 from nsendetzky/master

Fixes JSLint warnings