Merge changes, fix #37, add fill missing to vectors, update NUnit
Fix #29
Remove duplication, fill missing correctly