Adding NA values
Merge branch 'bug-fixes' into features