Added semicolons + code enhancements to fix jshint warnings
Merge pull request #286 from mkurz/fixjshint

Added semicolons + code enhancements to fix jshint warnings