fix for issue #38
Merge remote-tracking branch 'origin/master'
changed up my logging slightly.
removed all the extra stuff not related to issue #38. fixed up the log-and-return-empty-logic on line 36 per jonafato and dirns suggestions
corrected incorrect variable name
Merge pull request #39 from talam/master

fix for issue #38