Merge pull request #2 from DiyaKhan/master

Added logging
error handler ignored by jshint