Fix handling of empty values
Fix indent
Merge pull request #7 from gadelat/master

Fix handling of empty values