update error logging with error messages
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from milindaperera/master

Merging code improvements