fixing issue #12

Mismatch b/w blank string ("") and NULL pointers
Merge remote-tracking branch 'upstream/master'