Merge pull request #35 from michsch/master

some minor changes for jshint