Feature/empty values are nil

Discuss…