Added some improvements to the pr for "empty value" use case
Merge pull request #12 from javiertoledo/pr/11

Added some improvements to the pr for "empty value" use case