Merge pull request #305 from afrjorge/master

[CLEANUP] - minor bug fixes in map and broadcast samples