Added delta_map function to compare maps
Merge branch 'master' into mod-pid