FW-292. Fixing sub-task FW-295.
FW-292. Fix for FW-296.
Merge pull request #117 from openwsn-berkeley/develop_FW-292

FW-292. Fix.