Merge pull request #307 from afrjorge/master

[CLEANUP] - minor bug fixes in map and broadcast samples (version 4.x)