Added feature of types without any entries
Merge remote-tracking branch 'origin/master'