508 fixes, empty label
Merge pull request #19 from nayanjain/master

508 fixes, empty label