Added address type in addEntry
Merge remote-tracking branch 'origin/master'